From 686bde3ed0eafa92c6b3a1a8603ff1a1ade663f8 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Sat, 18 Mar 2006 16:30:20 +0000 Subject: [PATCH] linux-x86_64: Sync with native. From: Jan Beulich Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S index b2bcfb47e6..6f797e457d 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S @@ -818,7 +818,7 @@ ENTRY(do_hypervisor_callback) # do_hyperviosr_callback(struct *pt_regs) jmp error_exit #ifdef CONFIG_X86_LOCAL_APIC -ENTRY(nmi) +KPROBE_ENTRY(nmi) zeroentry do_nmi_callback ENTRY(do_nmi_callback) addq $8, %rsp @@ -828,6 +828,7 @@ ENTRY(do_nmi_callback) XEN_BLOCK_EVENTS(%rsi) GET_THREAD_INFO(%rcx) jmp retint_restore_args + .previous .text #endif ALIGN -- 2.30.2